Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show additional daily appointments link #124

Merged
merged 3 commits into from
Oct 19, 2023
Merged

Show additional daily appointments link #124

merged 3 commits into from
Oct 19, 2023

Conversation

raviks789
Copy link
Contributor

fixes #109

@cla-bot cla-bot bot added the cla/signed CLA is signed by all contributors of a PR label Sep 21, 2023
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 11 times, most recently from 25f61b8 to a1bd64d Compare September 28, 2023 11:21
@raviks789 raviks789 self-assigned this Sep 28, 2023
@raviks789 raviks789 marked this pull request as ready for review September 28, 2023 11:22
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch from a1bd64d to 04e19d4 Compare September 28, 2023 14:58
nilmerg
nilmerg requested changes Oct 5, 2023
View reviewed changes
Copy link
Member

@nilmerg nilmerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • The fourth entry is still shown if there are more than four
  • The counter shows +0 entries if there are exactly four entries
  • The counter shows +2 entries even if only one is hidden

library/Notifications/Widget/Schedule.php Show resolved Hide resolved
library/Notifications/Widget/Schedule.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Outdated Show resolved Hide resolved
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 6 times, most recently from 1330f6c to 1ac60e0 Compare October 11, 2023 13:58
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 5 times, most recently from 43adfe3 to 76c2d8b Compare October 13, 2023 07:47
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 2 times, most recently from 809ebd5 to f507d94 Compare October 16, 2023 15:27
nilmerg
nilmerg requested changes Oct 17, 2023
View reviewed changes
Copy link
Member

@nilmerg nilmerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a follow-up to my previous review

library/Notifications/Widget/Schedule.php Outdated Show resolved Hide resolved
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 3 times, most recently from f8984b0 to 71d1d72 Compare October 17, 2023 14:20
nilmerg
nilmerg requested changes Oct 17, 2023
View reviewed changes
Copy link
Member

@nilmerg nilmerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will continue tomorrow

library/Notifications/Widget/Schedule.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar.php Show resolved Hide resolved
nilmerg
nilmerg requested changes Oct 18, 2023
View reviewed changes
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/DayGrid.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Outdated Show resolved Hide resolved
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch from 71d1d72 to b3adfb6 Compare October 18, 2023 12:34
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 4 times, most recently from 6b4d08b to a8308c6 Compare October 18, 2023 14:59
nilmerg
nilmerg requested changes Oct 19, 2023
View reviewed changes
library/Notifications/Widget/Calendar.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/BaseGrid.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/DayGrid.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
public/css/calendar.less Outdated Show resolved Hide resolved
public/css/calendar.less Outdated Show resolved Hide resolved
public/css/calendar.less Outdated Show resolved Hide resolved
public/css/calendar.less Outdated Show resolved Hide resolved
library/Notifications/Widget/Calendar/ExtraEntryCount.php Outdated Show resolved Hide resolved
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch 2 times, most recently from 9122c73 to 2124dd3 Compare October 19, 2023 11:20
nilmerg
nilmerg approved these changes Oct 19, 2023
View reviewed changes
Copy link
Member

@nilmerg nilmerg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rebase

@raviks789
Add day mode to the calendar
1e00325
@raviks789
Show extra appointments link for week and month views
df7e54f
@raviks789
Calendar: Ceil the limit for the recurrent entries
68ea489 
For example an entry that runs over 48 hours, starts at monday at midnight and is repeated every 2 days.
Requires to ceil the limit to show the last entry in the week view that goes into the next week.
@raviks789 raviks789 force-pushed the show-additional-daily-appointments-link branch from 2124dd3 to 68ea489 Compare October 19, 2023 15:14
@nilmerg nilmerg merged commit 93bca74 into main Oct 19, 2023
13 checks passed
@nilmerg nilmerg deleted the show-additional-daily-appointments-link branch October 19, 2023 15:17
@nilmerg nilmerg added this to the Preview #1 milestone Nov 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flourish86 flourish86 Awaiting requested review from flourish86

@nilmerg nilmerg Awaiting requested review from nilmerg

Assignees

@raviks789 raviks789

Labels
cla/signed CLA is signed by all contributors of a PR
Projects
None yet
Milestone
Beta
Development

Successfully merging this pull request may close these issues.

Schedule configuration doesn't show more than 4 entries per day/week
2 participants
@raviks789 @nilmerg